From 568b42bd529972eb26a1df0fd8d3c6e74933c3da Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Thu, 20 Aug 1998 20:10:52 +0000 Subject: [PATCH] silly visual fixes * gdk/gdkrgb.c: silly visual fixes * gtk/testgtk.c: call gdk_rgb_init so color preview test actually works -Yosh --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/gdkrgb.c | 4 ++-- gtk/testgtk.c | 2 ++ tests/testgtk.c | 2 ++ 10 files changed, 55 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3e346e70b8..c406187729 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3e346e70b8..c406187729 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Thu Aug 20 13:04:08 PDT 1998 Manish Singh + + * gdk/gdkrgb.c: silly visual fixes + + * gtk/testgtk.c: call gdk_rgb_init so color preview test actually + works + 1998-08-20 Federico Mena Quintero * gtk/gtkhandlebox.c (gtk_handle_box_button_changed): Do not do diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c index f884b8af4f..0e6c0a2eaf 100644 --- a/gdk/gdkrgb.c +++ b/gdk/gdkrgb.c @@ -441,7 +441,7 @@ gdk_rgb_score_visual (GdkVisual *visual) sys = (visual == gdk_visual_get_system ()); - pseudo = (visual->type == GDK_VISUAL_PSEUDO_COLOR); + pseudo = (visual->type == GDK_VISUAL_PSEUDO_COLOR || visual->type == GDK_VISUAL_TRUE_COLOR); if (gdk_rgb_verbose) g_print ("Visual 0x%x, type = %s, depth = %d, %x:%x:%x%s; score=%x\n", @@ -2470,7 +2470,7 @@ gdk_rgb_select_conv (GdkImage *image) else if (vtype == GDK_VISUAL_TRUE_COLOR && byte_order == GDK_MSB_FIRST) { conv = gdk_rgb_convert_truecolor_msb; - conv = gdk_rgb_convert_truecolor_msb_d; + conv_d = gdk_rgb_convert_truecolor_msb_d; } else if (bpp == 1 && depth == 8 && (vtype == GDK_VISUAL_PSEUDO_COLOR #ifdef ENABLE_GRAYSCALE diff --git a/gtk/testgtk.c b/gtk/testgtk.c index f64d4e4a46..22cb8990cf 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -7683,6 +7683,8 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); + gdk_rgb_init (); + /* bindings test */ binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_WIDGET)); diff --git a/tests/testgtk.c b/tests/testgtk.c index f64d4e4a46..22cb8990cf 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -7683,6 +7683,8 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); + gdk_rgb_init (); + /* bindings test */ binding_set = gtk_binding_set_by_class (gtk_type_class (GTK_TYPE_WIDGET)); -- 2.30.2